Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Sun, 17 Jan 2010 21:57:00 +0000 (21:57 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Sun, 17 Jan 2010 21:57:00 +0000 (21:57 +0000)

Trivial merge